started work on refactor-rename layout, #38