Merge feature/navbar into develop