Fixed several minor UI issues