pad shiz accordingly. also take labels off activity chart
Merge remote-tracking branch 'origin/develop' into develop