Redo default homescreen, and clean up code

Change-Id: Ibbdd3af134bb8dc097f9442e4ebfd4bc74a62514