Update ID and Class names to use dashes instead of underscores.

There was a conflict with the dashboard template just before I was going to submit the pull request. I'm pretty sure I got it worked out, though, it'll need to be double checked (I haven't had to deal fixing to many conflicts in the past).