make field list and graphs more modular, remove unneccesary script tags from layout
Merge branch 'JW'