reorganize the html and /views