FAIMS-421: adding button labels
merging master
FAIMS-421: adjusting button label style
FAIMS-421: adding missing files to last commit