Revert "More stage cleanup"

This reverts commit 106ecb03d4d72fa59dfb82e61dd13590e585bdb5.
Revert "Let fxml generate the scene"

This reverts commit 99ed3fe3dbc414ad1ac3826a4ab387eb88251021.