Reorganize, add menus