fix navigation list, change toolbar