Added more themes and buttons to map
Started adding progressbar