Rework of the html/css layout

Now a bit more clean. Bugs may have been introduced.