+ Added some ui improvements in edition