Event layout fixes