first pass at new editor style