added icons, refactored code and deleted unneeded files