diff --git a/Demo_Desktop_Widget_Email_Notification.py b/Demo_Desktop_Widget_Email_Notification.py
index 79494006..8c371ad4 100644
--- a/Demo_Desktop_Widget_Email_Notification.py
+++ b/Demo_Desktop_Widget_Email_Notification.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import sys
+
 if sys.version_info[0] >= 3:
     import PySimpleGUI as sg
 else:
@@ -10,24 +11,32 @@ import imaplib
 from datetime import datetime
 import calendar
 
-# Change these to match your email setup
+IMAP_SERVER_GMAIL = 'imap.gmail.com'            # gmail server address
+IMAP_SERVER_HOTMAIL = 'imap-mail.outlook.com'   # hotmail server address
+
+################# Change these to match your email setup ################
 LOGIN_EMAIL = 'you@mail.com'
 LOGIN_PASSWORD = 'your email password'
-IMAP_SERVER = 'imap-mail.outlook.com'           # change to match your email service
+IMAP_SERVER = IMAP_SERVER_GMAIL                 # change to match your email service
 
 MAX_EMAILS = 10
 
+
 def gui():
     sg.ChangeLookAndFeel('Topanga')
 
-    sg.SetOptions(border_width=0, margins=(0,0), element_padding=(4,0))
+    sg.SetOptions(border_width=0, margins=(0, 0), element_padding=(4, 0))
 
-    layout = [[sg.T('Email New Mail Notification'+54*' '), sg.RButton('', image_data=red_x, button_color=('#282923', '#282923'), key='_quit_')],
-              [sg.T('', key='_status_', size=(25,1))],]
+    layout = [[sg.T('Email New Mail Notification' + 48 * ' '),
+               sg.RButton('', image_data=refresh, button_color=('#282923', '#282923'), key='_refresh_',
+                          tooltip='Refreshes Email'),
+               sg.RButton('', image_data=red_x, button_color=('#282923', '#282923'), key='_quit_',
+                          tooltip='Closes window')],
+              [sg.T('', key='_status_', size=(25, 1))], ]
 
     for i in range(MAX_EMAILS):
-        layout.append ([sg.T('', size=(20,1), key='{}date'.format(i), font='Sans 8'),
-                        sg.T('', size=(45,1), font='Sans 8', key='{}from'.format(i))])
+        layout.append([sg.T('', size=(20, 1), key='{}date'.format(i), font='Sans 8'),
+                       sg.T('', size=(45, 1), font='Sans 8', key='{}from'.format(i))])
 
     window = sg.Window('',
                        no_titlebar=True,
@@ -38,7 +47,7 @@ def gui():
 
     # move the window to the upper right corner of the screen
     w, h = window.GetScreenDimensions()
-    window.Move(w-410,0)
+    window.Move(w - 410, 0)
     window.SetAlpha(.9)
     window.Refresh()
     status_elem = window.FindElement('_status_')
@@ -48,7 +57,7 @@ def gui():
         window.Refresh()
         read_mail(window)
         status_elem.Update('')
-        event, values = window.Read(timeout=30*1000)
+        event, values = window.Read(timeout=30 * 1000)  # return every 30 seconds
         if event == '_quit_':
             break
 
@@ -70,29 +79,28 @@ def read_mail(window):
     search_string = '(SENTON {}-{}-{})'.format(now.day, calendar.month_abbr[now.month], now.year)
     (retcode, messages) = mail.search(None, search_string)
     if retcode == 'OK':
-        msg_list = messages[0].split()      # message numbers are separated by spaces, turn into list
-        msg_list.sort(reverse=True)         # sort messages descending
+        msg_list = messages[0].split()  # message numbers are separated by spaces, turn into list
+        msg_list.sort(reverse=True)  # sort messages descending
         for n, message in enumerate(msg_list):
             if n >= MAX_EMAILS:
                 break
             from_elem = window.FindElement('{}from'.format(n))
             date_elem = window.FindElement('{}date'.format(n))
+            from_elem.Update('')  # erase them so you know they're changing
+            date_elem.Update('')
+            window.Refresh()
             typ, data = mail.fetch(message, '(RFC822)')
             for response_part in data:
                 if isinstance(response_part, tuple):
                     original = email.message_from_bytes(response_part[1])
-                    date_str = original['Date']
-                    cut_point = date_str.find('-')          # a hack to shorten the datetime string
-                    if cut_point == -1:
-                        cut_point = date_str.find('+')
-                    if cut_point == -1:
-                        cut_point = len(date_str)
-                    date_str = date_str[:cut_point]
+                    date_str = original['Date'][:22]
                     from_elem.Update(original['From'])
                     date_elem.Update(date_str)
-                    window.Refresh()                        # make the window changes show up right away
+                    window.Refresh()  # make the window changes show up right away
 
 
 red_x = "R0lGODlhEAAQAPeQAIsAAI0AAI4AAI8AAJIAAJUAAJQCApkAAJoAAJ4AAJkJCaAAAKYAAKcAAKcCAKcDA6cGAKgAAKsAAKsCAKwAAK0AAK8AAK4CAK8DAqUJAKULAKwLALAAALEAALIAALMAALMDALQAALUAALYAALcEALoAALsAALsCALwAAL8AALkJAL4NAL8NAKoTAKwbAbEQALMVAL0QAL0RAKsREaodHbkQELMsALg2ALk3ALs+ALE2FbgpKbA1Nbc1Nb44N8AAAMIWAMsvAMUgDMcxAKVABb9NBbVJErFYEq1iMrtoMr5kP8BKAMFLAMxKANBBANFCANJFANFEB9JKAMFcANFZANZcANpfAMJUEMZVEc5hAM5pAMluBdRsANR8AM9YOrdERMpIQs1UVMR5WNt8X8VgYMdlZcxtYtx4YNF/btp9eraNf9qXXNCCZsyLeNSLd8SSecySf82kd9qqc9uBgdyBgd+EhN6JgtSIiNuJieGHhOGLg+GKhOKamty1ste4sNO+ueenp+inp+HHrebGrefKuOPTzejWzera1O7b1vLb2/bl4vTu7fbw7ffx7vnz8f///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAJAALAAAAAAQABAAAAjUACEJHEiwYEEABniQKfNFgQCDkATQwAMokEU+PQgUFDAjjR09e/LUmUNnh8aBCcCgUeRmzBkzie6EeQBAoAAMXuA8ciRGCaJHfXzUMCAQgYooWN48anTokR8dQk4sELggBhQrU9Q8evSHiJQgLCIIfMDCSZUjhbYuQkLFCRAMAiOQGGLE0CNBcZYmaRIDLqQFGF60eTRoSxc5jwjhACFWIAgMLtgUocJFy5orL0IQRHAiQgsbRZYswbEhBIiCCH6EiJAhAwQMKU5DjHCi9gnZEHMTDAgAOw=="
 
-gui()
\ No newline at end of file
+refresh = 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACb0lEQVR4XpVTXUiTbxT/vePdFuF0BTFW9ufVvMlu+iACka6CQY1gQVdtEmTMpSKzzJT/RTdCRHhT4F0Us8LGVqlo1lZaFslWQWBkN+tDkpSpbfNz797T8zy6DbUbf/Dbec7vfOycMwa0DBJjM7Ko72mBtz+KplCS6Ronf3NNxNZBt2qv4dJzL0uKwGRqU/6zHDqyd1dBk32/xMnfXOMxkVPXXYlVSLjykk4fKIb/4zgUSxEO7zRBKd4Bjm/jU9ys8f2fJoCFhRiWl6pw6+Qw0BymhlfT5Lg/xmycHA++ktL+nsRqrUOrdpBpH6hhKC7yhObti0CgKUTu0KTgcd8X4j4aB2bYvj7UPqkQrO/1cU25ESV3eJJO8LzLIQ11/CYXn5Grf4KqGF19E3Ts9iixe2QPm0dtt5PtP6NcHxF5ZVfDhIbeqMQ6E0hcI4ec327jah513T4YDM5TR/dh8vc0hkfHUxI2gwuPKyDLb2wV5cIdePuZZGwWmQxSSyqICFBVyKgJJkFaQW4Hna4THQ4X/gUiD2+QXEwjNZsASJvTgWgMqoY95WWw7raAJdjheeTEeniCTqgZu2IxswnSmGI3gEZjMiQpAMocTC2nJcm4hU9gRjp9E+6Ajb07wKFpHqRVOzKqedFUhOX4HyRnEwSjMQCB8/4IqnxU2DYiaGnsIe7n2UlK61MWe0dbW18Ijdfk/wuy7IXeEEvEvmM+kcRM4XYYSkohW62ChtIS/NKbWGwO8z9+Anp9TNSsQU2wEtVdEZy5o7Gfi7Z5ewj/vxbkPs51kYhVP4zAw3I3IN+ohSVFcfZeEs67Gid/c03E1uEv5QpTFzvZK5EAAAAASUVORK5CYII='
+
+gui()