Some objects restructure and small fixes

Clicking any of the add/remove buttons for rows/columns appears to be busted in IE8.
So, never mind this file for now. It may have bugs and we don't care so much.