Worked more on newUI