New UI code added