Switch main buttons for menu [fixes #87]

Starting process of reformulating navigation / layout