Final ui changes