changes to styling
Merge branch 'shadae_users'