Fix a couple of UI bugs