Add nav and activation code

Add nav and activation code