minor layout, route, and other changes