make some fix in views