EMP tab improvements
Merge pull request #54 from AnnaStorozhenko/master

EMP tab improvements: Issue #50