No need in old layouts
More done, unescaping