added changes to several views , need fixes