Darrien's UI adjustments