Fix issue #26 Add ability to switch between default and experimental image layout.