pre-deployment UI fixes