Fixed a few typos and fixed layout