Changing the button once calculate is handled
updating to include android interface, few bug fixes also