More responsive, added table to main test