Fix minor layout bugs.