Changes of layout

Basically