navigaion partial was refactored