updated home screen
merger conflicts