fixed navigation bugs and cleaned up

Fixed issue #102 and cleaned up location display a bit.