Add block navigation guards#54

Enteee wants to merge 3 commits intomasterEnteee/count:masterfrom

feature/block-navigation-guardEnteee/count:feature/block-navigation-guardCopy head branch name to clipboard