Adding setup page
Merge branch 'register' into testing