Reorganize menus

Reorganize menus to better reflect google music