Moved formatting from table partial to the index page to simplify things.
More refactoring