Map controls and some other menu bugs fixed