improved views and error handling