Markup updates

:construction_worker: 

As part of performing the SEO audit, there are various markup changes being made to make the application more consistent and tighter.
We may not have `@user.name` for all users. Would it be preferable (and more Ops-y) to use `@user.username`?