Spacing improvements. Simplify contact block.