Code clean up and map button changes

Cleaned up HTML and Javascript code