popup + font-weight fix
Merge branch 'greg'