fixing layout and expiration years