Fix small UI bugs