Fixed and tweaked main layout

[#239]