Added smiley per answer + small changes