HomeFragment improved