Merge branch 'develop'
Added Jets
Simplifying plot page