update layout to use table