refactor home controller/fix merge conflicts