#263 change divs to table
Merge branch 'issue_263' into develop