[PATCH conductor] Cleans up tables and their surround controls throughout the application.