more id's for UIFR-118
UIFR-118: improve the js as per Darius's suggestions
UIFR-118: one more cleanup I missed
Merge pull request #3 from LeeBreisacher/UIFR-118

more id's for UIFR-118