[#67] Fix typos and layout