Fixed minor UI bugs