fixing partially user view and making it more performant