active admin and other changes