Changes for Group Type, Time line and other point suggested by Gaurav.

Signed-off-by: Babita Dhami <babita.dhami@evontech.com>