Updated widget to draw borders