Some layout changes and spelling