fixing some Homscreen Probs