Crash fix and login screen improvement.