Fixes, and adding Image proper visual state structure