fix home screen display on windows
fix merge conflicts to update the gui homescreen