Indentation fixed and Button names changed