20141209 - Fix Navigation