Fix layout/sizing issues