Fixed header, padding issues, added table