Further update to basic navigation