added menus and stuff