Added error view, renamed some views, fixed bugs