Small changes to layouts (Safety)