Fixing the elements drawing
merging