Main layout fixes