Refactored notifications to be shown for a longer time