Made more edits to layout