change design to use table instead of list