Added more views and improved authenticating model