Fixed some view logic
missing files
one more