Fixed check states again and updated Summary page