Fix margins and spaces