Functionality update

With claims, removing images