fixed bug where loading would show up when clicking arrows on map, also a bit of refactoring