clean up
full menu and restructure