EMP tab improvements