Fixed some bugs, changed settings and icons