Adds collision detection and second UI stage for each screen
Merges collision detection and UI stage stuff with previous commits