Commit fix image controls