Buggy layout, and remove the old renamer