Revamp NEWLAYOUT with vcsh in mind