Format changed to use css table