UI improvements, new features

Indicator modifier added to tracking
More consistent variable use
Increased jquery usage to simplify logic