Cleanup, text.html template uses new layout-v4