new 2level and fix navigation