Some layout changes
Some routing and style changes