Fix some typos and polish layout