Updated the main activity layout, and main counter classes