Layout fixes 2.