Major updates to info window and JS organization