All buttons working
Reviewed Version by MS