Cleanup, using naming convention
Ditched legacy Form
Added widgetset optimization, works half way currently