Added a navbar
Modified favicons
Merge branch 'design'