Made some layout changes and fixed typos