Tables forms

Had a weird issue when I pulled from 4.0, showed that I had a bunch of modified js files, wouldn't let me switch branched till I did a committed the changes 30923b8.