getting rid of black and yellow backgrounds
few more changes