general update, meking navigation work properly