Change if statements to guard operators
Fix header layout