Improve data tables layout