applied same fixes on the views folder