weather integration, cleaning up page2 code