Navigation close state

Resolves #605 and does a bit of cleanup on both client and admin sides.

@angaither 

CC: @barryclark