Fixed picture sizing

Signed-off-by: Aubrey Howell <simplyaubs@gmail.com>
Resolved merge conflict

Signed-off-by: Aubrey Howell <simplyaubs@gmail.com>