Styling and some route fixing