Lala
Some views fixes