Board matches the number pad now. Also changed some const/static stuff