Re-layout edit
Finish