zero's non clickable badges 19-Nov-2014

Zero's doesn't click and fixes certain more issues