All-in-one now. Added map part, created customized icon