adding html, partials, modified controllers for route management
merging properly