added dynamic borders, added color contrast