cleaned up code and added image/map views