Home screen fixes