Extract identity view models and fix views