Merge pull request #64 from stoewer/refactoring

Clean-up and refactoring
Tables: refactoring of table items

Things that still need to be done
* Replace usage of deprecated methods
* Remove deprecated methods