Improve the HomeScreen