EVL design tweaks [#55566004]