Added date logic and some styles