lots of JS, XML view clean-ups