Added extra submission validation, fixed error in building views.