Picframe refactoring