Main layout, couple of fixes