refactored HomeScreen a bit