Table rework

![gwtp - arcbees 4](https://f.cloud.github.com/assets/1794121/1502834/f2d57a62-48a0-11e3-9c38-68c4e87664c7.png)