refactored content navigation