Improve date formatting. Use moment.js