Made it modular, added splash screen and menu