Add check for range control and add calendar widget