Fix initial loading Bug on droids & share more