Changes to edit, layout and other stuff