More edits for design updates