Added classes. Unified spacing.