Merge pull request #422 from moneyadviceservice/nav_fixes

Add border-radius to the search input and submit in header
Adjust variable names
Adjust header components spacing