Layout and texts amendment