595-29

Added options page, though not sure what folder the options page belongs
in.  Also added an options nav button on the expiration page for testing
purposes.