Fixed a couple ux bugs.