Added borders for expanders
Merge remote-tracking branch 'upstream/master'