Added border color changing