added some app icon and moved code around