refactored data handling in ViewControllers, small bug fixes
refactor Activity, ActivityHistory class