Feat/moment

1. Added moments to display correct timestamp