Small tweakings on navigation
Started to work on the content