Started working on the menus. Various other issues fixed.