Switch from <div>'s to <table>