UI fix and formatting.