Refactor Create Workcells Screen