UI improvements for rc2