Better Z-index. Improved base forms