Fixing cancel button once and for all