updated font
refactor router.
fixed navigation.
refactor router.
Merge remote-tracking branch 'upstream/master'