moved views, upgrades to jadum