Redering and editor fixes