fixes to new main layout