Refractoring, moved staff to new page