Fixed cancel button. Also made other ui changes