HomeActivity fixes