Added edit layout
Merge branch 'iss13'