Added start/end screen
Refactored code and added utilities