Cleaned up registration and views and app layout