cleanup and navigation tuning