Merge "ImagePage refactoring"