UI changes before merge