Merge branch 'master' into esegev
Finished navbar

To-Do:
Add correct navbar borders,
Fix break points for responsiveness
Merge branch 'esegev'