layout updates and cleanup intergration with SQS.