UX changes for compact editor
am: b0550f0265

Change-Id: I512dc58e00bebfe92f60deb516485efc3386deef