Widget overhaul
jquery has issues but the form is done
Merge commit