updated routes, contollers and HTML
fixed merge conflicts