Fixes stop position for navigation & adds new md templates