BRANCH 4.3: minor layout fixes