adding index routes and layout html and css
fixing merge conflicts