Revert "Fixed Scoreboard Shots"

This reverts commit f47572f03e939343a4aea5afdf4fd8e0a0e8ff5e.
Revert bd8b346..4b3b68e

This rolls back to commit bd8b3466f27faba4e13e955e567069bba6fb9987.
Updates

- Added Datatable
- some basic formatting
- TODO on updating the model