renamed menus & added 2-layer security conditional
Merge remote-tracking branch 'origin/master'