Refactor Home ctrl