Added support for today button