bug and conflict fix. Navigation control generation modified.