Minor clean up like removal of test buttons for saving to DB. Still
having problem on the listView, only shows the score on the second click
of the button.