re-ordering + gutter updated