Added borders for expanders