Updated code from divs to tables