Update header secondary active state alignment
Fix merge conflicts
Merge with origin
Merge branch 'feature/projectview' of github.com:citrusmist/wpzest into feature/projectview
Merge branch 'feature/projectview' of github.com:citrusmist/wpzest into feature/projectview
Merge branch 'feature/projectview' of github.com:citrusmist/wpzest into feature/projectview
Merge branch 'feature/projectview' of github.com:citrusmist/wpzest into feature/projectview
Fix merge conflicts