Bug fixes

Fixed on launch animation madness