Websubmit crop

~~Please do not merge it yet work in progress~~
Thanks for the notice, I have amended with the fix and rebase against the latest master.