Feature #1664: Fix bug in graph plots
feature #1664: Finishing date picker, just cosmetic changes left