major improvement of layout

WIP