Cleaned up code and removed some duplication
Fixed theme issues and added static link to profile once registered