More refactoring of the small portrait activities