Refactor reqiured caused by crew page change