added sub menus
several layouting issues fixed