Switch table headers to seperate tablelayouts.  Add Comments.