changed the color on upcoming matches and fixed some margin issues