add folder_up navigation, refactoring