Fixed a Table Naming Issue; Added two buttons