Added error module, fixed view