A little more work on the UI design