Fixed bugs and add Expired button