Editor revamp

VIX-435