Refactor to new menu.css
Resolve merge conflict