Refactoring
Tweaks to screen transitions.