Some progress on UI.