Minor fixes on layout + typo