Fixed rendering on MES
Clean up!