Clean up panels markup