refactor: debug comments
fix: move id from div to table
Merge branch 'master' into developer