fix layout; add executor to order