Added more UI changes part II