Layout fix + CS fix + typo