Fixing drawing offsets
Merging