Features/25 improve layout

Hi @koffeinfrei,

the current implementation is a bit different to the styleguides.

For example there is a edit icon and a star in edit view which we probably won't need (for now?).

Thank you very much, Alex