refactorign: move relations to table
text bug fixed
Merge branch 'fixBug'