Changed how elements are rendered and removed to prepare for future jazz