Fix Issues #49 and #50, also tweaked the registration page layout.
Merge pull request #52 from benichu/bt-issue-49

Fix Issues #49 and #50, also tweaked the registration page layout.