Tidy old homescreen code up