updated some components to shared