fixed bugs and menus