Adjust table syntax; add remove functionality to table