Tables: refactoring of table items

Things that still need to be done
* Replace usage of deprecated methods
* Remove deprecated methods
Merge pull request #65 from stoewer/refactoring

Tables: refactoring of table items