Fixed a few more bugs with new UI.