minor layout and transition changes