Partils view refactored