Screens - State Image control fixes