Clean up and fix new table display select