Merge pull request #90 from mcclungt/back2basics

fixed solution title wrapping
only correct buttons show up on bubble view, changed button text