Improved TC UI