fixed bugs appearing in merge (still testing)
corrected merge error and improved css for maptool widget
fixed bug in scatterplot widget X options and improved css
cleaned up css for barchart