Custom User Model added, templates improved