More Changes (Working on dynamic navigation)