Changed layout from tables to divs