App: Little Adjustment to HomeScreen and clean up