Fix some more UI issues