Clean up user preset dialog

Change-Id: Idefafe3a877e8a0cf25ca955f689818e193fde72
7 files changed