Fixed and tweaked main layout

[#239]
Merge pull request #158 from gotar/239-fix-and-tweaks-for-layout

Fixed and tweaked main layout