Refactor tables on metdata page