Remove crispy forms usage
Correct markup