Refactored home_controller a bit