Cancel-button bug

Seems like there was a big doodoo in here. Yikes! (Needs to be pulled into prod server)