Fix layout and routes