removed loader, swapped views