[#78080780] Clean up top and sidebar menus