tweaking fonts and spacing
Icons on nav
solving conflicts
Merged and fixed conflicts
fixing main navigation baseline
Merge branch 'feature/29' into develop