replaced activity tabs with buttons
styling
more styling
Merge branch 'dev'