Updated table format, added remove functionality