More work done on 3.0 UI.