More cleanups and navigation code...