Replaced fake tables with real ones because logic
Refactored layout