Organize/add map categories

Added more categories
Alphabetized list
Cleaned up code