Fixes on layout in edition