Score Summary working + refactoring to .xml names
LayoutLand bug sorted and refactoring with package additions