Improved UI. Fixed TF bugs.