#22 - fixed widget so it saves values on form submit