Layout Fixes for Event Listen Types