More routing and CSS
Fixed conflicts