Images and States revamp continued