Fix margins and typos