Added angular form with error handling