Changed from using text fields to tables to improve maintainability

Changed from using text fields to tables to improve maintainability