Fixed the date bug and some visual enhancements