Added option for border width