updated navigation
updated navigation, refactoring