Moved date conversion from model to view