Fix Table rendering