Fixed minor layout issues