Improve HomeScreen + fix user-select