Removed button. Improved calculations. Minor refactoring.