Fixed routes, views, and CSS
forgot one file
merge conflicts solved