Remove duplication of modes
Hack to prevent editor gutter from flashing
Add more padding