Fix the smiley ordering issues