Fix: home controller after refactoring and add comments