other forecast changes
merge conflict fix
Merge pull request #11 from Elffers/forecast

other layout tweaks