Fixed Resizable
FIxed Stop button text
Merge remote-tracking branch 'origin/master'