Fixed minor UI issues