Some views fixes