Fixed numbers not resetting, centered shoot icons
Merge branch 'feature'