Solved a few display bugs and added smileys