fix scaling problem for single image layout
Merge branch 'lyman_branch' into test_branch
change reply to comment
add more to comments
create comment