UI improvements_Maps