Added table formating