Output layout fixes