Fixes known issues with picture displaying