fixed buttons issues
fixed buttons issues and scaling for foundational statements
Merge branch 'elaksana-master'