Adding buttons as Widget for Form Element, and applying some updates, fixes and changes