refractored container navi