Through step 2, with nav-bar and fonts style added
last update of the night.