minor layout refactoring