Made some changes
Merge Susie's changes to upvote glyphicons