added better icons and better exception management