changed model to use date object and ui improvements