feature/fix-accordion-borders

Merge border chsnges to develop