Small views fixes