Updated table to have a decent layout