Refactor editor and add base breakpoints in gutter