fixed removal of map thingy
also moved button up
Merge branch 'fix-merge' into develop