Content SP UI fixes