More tables added (but commented out)
Buttons added