Moving some things around and fixing launcher redraws.