Refactored image layout