Added more UI Chages