improving menus, adding shapes