Fix sicial login labels
Improve pages
Minor page fixes
Merge branch 'dev'