Grid and menu fixes