Output name fixes

Cleaned up the Output names and started working on condensing some of
the javascript.