Add responsive photo layout to album page
Fix merge conflict