Fix layout and other things...