Added expiry info to display and disabling display when expired. Closes #11