Full commit of rating_tab to master

Couldn't get merge and pull request to work right so I'm manually
committing the full changeset from my layout work in rating_tab branch
to master.