Fixed html and cleaning some controller for data import.