Navigation fixes and improvements

- Fix #93 
- Fix #129 
- Fix #150 
- Add debug view preset
- Some code clean up