minor layout modifications and clean-up