Fixing minor bugs in the discard controller/view