changes applied to main navigation and renamed side menu

additional changes as requested in issue#48, new buttons
Main navigation now reflects where user actually is based on btn
variable.
We will use something similar for the sidemenu in stage 2