minor reorganize, gonna add menus for exiting