More changes to HomeActivity