Fixed some minor UI issues