Add better handling of data. Rotation keeps now zoom and position