Fix layout + typos