Adjusted id fields so the id is entirely visible