added routes and css
added routes and css
fixed merge conflict