Changes

Added change activities swiping
Optimized calc