Fix minor UI issues