Bug and pictute fix