updated worker and layout