fixes to main layout