Fixed score edit
Added Edit Button #28
Merge branch 'beta'