Fixed Nav taken care of --- again