Minor refacroting. And added new launcher icon.