Fix minor UI stuff