Code cleanup mostly

Also added a popup at the bottom of the map