Refactored header and header button placement.