Refactoring

Some bugs are fixed such as the date doesn't show in a right way.