Refactored navigation block
Mark version 1.0.3