Merge branch 'hotfix/v0.2.7.1' into develop
Update navbar to final options
Merge branch 'release/v0.3'