completed menus, and refactored alot a code