Fix Controller and images