Commit current layout before major revision
Complete redesign