refactor layout & headings