Added back date ui_helper and updated time helper