Lot of changes for kick View