More layout changes

* Made layout more robust, still relying on CSS only and no js
* Made changes to pass validation at W3C