Refactored code. Added icon and splash screen