Add moment.js and improve time output