Pulled in Matt's UI updates