Editmap and uistate update: Minor ui corrections