Resolved issue with buggy date controls

Fix #637 

This does not fix the issue w/ the apply button becoming enabled. I will have to look into that
Signed-off-by: Sheik Hassan <solergiga@yahoo.com>