removing some unneeded code, changing some icons