Fix a couple UI issues