Added css and fixed routing
merged