Changes for Auth and styling
Merge branch 'develop'