Add back all time checking, button styles, footer changes