Integrated layout fixes from PHP app.