Added Gift Picture Addition fixes