cleaned up menu, removed extra tabs, simplify on pop-up menu