margin and menu fixes