Refactored Navigation #59

Here's my initial proposal, see if this could be improved further.
This is better.. coz if don't do this - logic will change and developer even don't know that option isn't setting anymore.