EMP tab improvements

Issue #50