fix hierarchy and robot layout