Made some much cleaner code in DrawMap by implementing better methods in MapModel, slightly scewed view