gradient fix & border fix