Add icons in buttons, and some bugs.