Corrected shape listeners and clear button