united migration to initial_setup migration, visual improvements