Styling and route fixes