Merge dev to main

This includes the user forecast display.