Fix for duplicated active pages in navigation
Merge branch 'develop' of https://github.com/pi-engine/pi into develop