Few components upgrades & some cleanup