Clean up and documentation

Also fixed nav escape