Add better handling of alert screens