Add calendar entry window, improve main window