Better image fitting