tweaked rename layout