Configured app for Production emails
Cleaned up registration views and app layout.

But there's a bug of some kind.
fixed typos
fixed merge conflict