Made the tim_activity_main layout (hopefully) look better
Merge remote-tracking branch 'origin/master'