Fix Map Tab.
Code Clean up
Add refresh button (WIP)