added momentjs and replaced date formating