Fix PS tooltips

They now show in battle
Merge branch 'design' into gh-pages