Fix various little UI bugs