Changing layout to tables
Merge branch 'tableview'