added end option, improved button logic
Finished.......but not completed yet...