Fixed for component navigation
Merge branch 'develop' into media