Ironed out some minor layout quirks