re-routing, added components, css changes