Revert "Our last project + bug fixes"

This reverts commit d2426b02388ebeefcf4142b1ec2498c23ed45733.
set time now with design
Set time with design