First step of fixing layout and fixing typos