Fix save/edit jumping
Wrap form controls with form group and add labels