Added border rendering