Clean up
Added menus & some clean up