Responsive Images changes and TODO updates