Fixed #167 and #312 - nav bar router issues