{Refactor} Clean up controllers and html files