Merge pull request #171 from burstly/master

Added border to expandables
Rearranged js
Merge pull request #172 from burstly/dev

Dev