Massive changes in model + built journey admin