Fixed #69
Fixed a little UI glitch.
Fixed #72