Layout fixes, for devices mostly.