URGENTLY change the buttons on the screen layout.

Since the last change the map/satellite button is partially obscured by about suncalc/improvements button and in the other corner the map +/- button is obscured by the weather button. This happens on a PC and and I pad, making the ipad version impossible to use the satellite option for the map.

This needs urgent review.