Improvements to load Marathon + app loading