Add modal loading, removing none mains, and some more