implemented very basic editing layouts
fixed some merge conflicts