fixes to keep/discard buttons