button pad and card panel
suggestion dialog panel
merging changes
Merge origin/master
merging changes