Updated views and error messages