improving mark up for btns to be more flexible
add newFirefly btns file
button upgrade
language clean up