Added loading, fixed remove bug