Update MainActivity to handle rotation correctly
Refactor StartupFragment