UI update and rewrite checking of date