fix issue with controller loading
move nav logic into controller
fix spec
update changelog