Fix layout and remaining errors