delete echo and border
Merge remote-tracking branch 'origin/widget'