Some small views fixes