Modified UI and Other updates