A few more map UI fixes