UI adjustments + code cleanup.