Added table view
Optimized build