Fixing minor layout issues