Remove sacrifice; More UI fixes