Gui improvements

Map chart with map
Layout improvments