working on icons
working on icons
map and database working