Fixed several UI issues