Refactored some html files