Moved the map tab to the end
Changed out icons