Adjust variable names
Adjust header components spacing
Merge pull request #423 from moneyadviceservice/nav_fixes

Nav fixes