Added icons and icon selector. Fixed some bugs.