GUI Cleanups
Adding datepicker and more gui code cleanups and seperation
Merge remote-tracking branch 'origin/master'