Cleaning up routes and basic style/spacing updates