Move button inside input and improve editable widgets

review9821002