systemui fixes take 1