Addition of table-view and refactoring of maintenance list