A lot of progress on the UI