Updated borders and sidebar