Added time and remove buttons and made them work.