Little bit of home screen cleanup from code review