Fixed issues with no picture or picture sizes