HomeController improvements