updated navigation, renamed pages