Added icons and some minor bug fixes