vanillanestor - Mark asked for a new layout