fixes #225
update image layout
fix #227
fixes #223
fixes #230
fixes #231