Loading win / loose screen & minor cleanup