Draw elements improvements