Home overlay more fixes