Modified Navigation, added comments