cleaned up navigation code