changed launcher icon, and refactor