- Merge Wilzer's HomeScreen edits