Pull request for merging dev into staging ( menu change #2 ) - sprint 40