Fix some minor UI