Adding work layout fixes