refactor picture wall