Improved elements drawing. Improved frame