Menu renamed to Nav, Load clean up