Additional UI improvements