Added border styles and updated widgets to use them