Fixed some simple formatting in the template
Cleaned up the table structure.