Fixed menu structure, removing unnecessary container classes