Fixed some minor UI bugs