Refactored and fixed something in blocknavigator