Updated combine styling
JS moved to combined files
Merge branch 'develop'