Fix weather BG, clean up includes