Arunesh's changes, plus few other minor changes
animation and image changes