fixed button and typo's