Fixed some spacing
Fixed some spacing
Fix some dates issues