homepage and registration fixes
Merge branch 'master' into danny