markup and styling
Merge branch 'profile' into dev