Work on layout

- Slowly I'm getting where I want to get to, ;)