Revert and refactor header and layout