Switched to components based jquery