minor DRY changes, CSS ttweaks