Update home and charges views
Resolved all conflicts