Improvements to CustomAlert