Update button tags
Start moving game logic to a seperate class