comments
restructure navigator