Main menu markup fixes