Some UI fixes

Some UI fixes to containment