working on activities styles
Merge remote-tracking branch 'origin/bum' into bum
Refactoring bugs
Merge remote-tracking branch 'origin/bum' into bum