Homescreen and heat map settings screen is fixed