Code refactoring issue-item/home, issues #283