button comments
fix merge errors
fixed text clearing, empty string, button font sizes