Working on btns and form updates