Fixing a couple of UI bugs