Made show-solution button dynamic sized (px -> em)
Merge branch 'master' into api-1.1