Refactor tickets

Just added / fixed the datatable in this file! Refactoring this file is not in the scope of this PR!