Fixed table and form nesting issue that prevented admin from working on specific browsers
Merge remote-tracking branch 'origin/master'