added variables, textfields and calculations
added battle activity below settings menu
merge conflicts resolved