Refactored the layout and headings.