HTML/controller changes for Registration
Merge branch 'curr-local'