Added proper menu highlighting
Merge branch 'staging'