Did a bit more work on UI.