task #00026-Vinos_edit: Form redirect fix
task #00026-Vinos_edit: Style fix
Merge branch '00026-Vinos_edit' into develop