Database class completed and other minor fixes on the map icon