added border states and fixed border radius not rendering properly