Fix various UI bugs