More finishing touches to editor