Save map button and some cleanup