Data table UI adjustments
Merge
Merge branch 'master' of https://github.com/alexfrndz/A3M