Fixed Tie and UI Issues